From c86e8d0e6004c71d95a819a948ac726e9f57a218 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 31 Dec 2017 11:40:00 -0500 Subject: [PATCH] color button: Stop connecting to ::delete-event We can just use GtkWindow::hide-on-close. --- gtk/gtkcolorbutton.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/gtk/gtkcolorbutton.c b/gtk/gtkcolorbutton.c index 3f2de5124b..fe8e95aadd 100644 --- a/gtk/gtkcolorbutton.c +++ b/gtk/gtkcolorbutton.c @@ -489,16 +489,6 @@ gtk_color_button_new_with_rgba (const GdkRGBA *rgba) return g_object_new (GTK_TYPE_COLOR_BUTTON, "rgba", rgba, NULL); } -static gboolean -dialog_delete_event (GtkWidget *dialog, - GdkEvent *event, - gpointer user_data) -{ - g_signal_emit_by_name (dialog, "response", GTK_RESPONSE_CANCEL); - - return TRUE; -} - static gboolean dialog_destroy (GtkWidget *widget, gpointer data) @@ -550,6 +540,7 @@ ensure_dialog (GtkColorButton *button) parent = gtk_widget_get_toplevel (GTK_WIDGET (button)); priv->cs_dialog = dialog = gtk_color_chooser_dialog_new (priv->title, NULL); + gtk_window_set_hide_on_close (GTK_WINDOW (dialog), TRUE); if (gtk_widget_is_toplevel (parent) && GTK_IS_WINDOW (parent)) { @@ -564,8 +555,6 @@ ensure_dialog (GtkColorButton *button) G_CALLBACK (dialog_response), button); g_signal_connect (dialog, "destroy", G_CALLBACK (dialog_destroy), button); - g_signal_connect (dialog, "delete-event", - G_CALLBACK (dialog_delete_event), button); } -- 2.30.2